Skip to content
This repository has been archived by the owner on Nov 1, 2024. It is now read-only.

Up250624 #340

Merged
merged 19 commits into from
Jun 25, 2024
Merged

Up250624 #340

merged 19 commits into from
Jun 25, 2024

Conversation

Vonsant
Copy link
Collaborator

@Vonsant Vonsant commented Jun 25, 2024

Vermidia and others added 18 commits June 17, 2024 00:03
* THE syndie microwave

* Always burn to explode microwave when copying

* Make it so copying ids stop when the microwave is goign to explode

* Made explosion destroy the board and spit out the machine parts

* Move logic is MicrowaveSystem, make metal cooking use the same logic

* Fix passing the wrong malfunction time

* Shuttle cannot escape aggressive branding

* Always make it explode with an id

* Forgot to invert bool, move it after fry chance
* Initial commit

* NT

* Update Resources/Locale/en-US/_NF/bluespace-events/events.ftl

Co-authored-by: Whatstone <[email protected]>

---------

Co-authored-by: Whatstone <[email protected]>
…sm (new-frontiers-14#1533)

* Cleanup, revised Solution split

* French spacing

* cryo pod: only extract cryogenics chems from soln

* Add Cryogenic metabolism group, add to organs

* Cleanup comments, "PerReagent" soln split & docs

* Comment accuracy

* SplitSolutionPerReagent: suggested fixes

---------

Co-authored-by: Whatstone <[email protected]>
* Ship Guide Reworks

Moved the repetitive piloting/hiring sections to their own entries. Changed some wording to be less ambiguous, tweaked some grammar.

* Update Resources/ServerInfo/_NF/Guidebook/Hiring.xml

Co-authored-by: Whatstone <[email protected]>

* Update Resources/ServerInfo/_NF/Guidebook/Hiring.xml

Co-authored-by: Whatstone <[email protected]>

* Update Resources/ServerInfo/_NF/Guidebook/Piloting.xml

Co-authored-by: Whatstone <[email protected]>

* Update Resources/ServerInfo/_NF/Guidebook/Piloting.xml

Co-authored-by: Whatstone <[email protected]>

* Update Resources/ServerInfo/_NF/Guidebook/Shipyard/Spirit.xml

Co-authored-by: Whatstone <[email protected]>

* Update Resources/ServerInfo/_NF/Guidebook/Shipyard/Searchlight.xml

Co-authored-by: Whatstone <[email protected]>

* Update Resources/ServerInfo/_NF/Guidebook/Shipyard/Searchlight.xml

Co-authored-by: Whatstone <[email protected]>

* Update Resources/ServerInfo/_NF/Guidebook/Hiring.xml

Co-authored-by: Whatstone <[email protected]>

* Update Spirit.xml

* Update Resources/ServerInfo/_NF/Guidebook/Piloting.xml

Co-authored-by: Whatstone <[email protected]>

* Apply suggestions from code review

Co-authored-by: Whatstone <[email protected]>

* Update guides.ftl

* Update Resources/ServerInfo/_NF/Guidebook/Piloting.xml

Co-authored-by: Whatstone <[email protected]>

* Update Ceres.xml

* Update Kilderkin.xml

* Update Legman.xml

* Update Liquidator.xml

* Added Expeditions guidebook entry

Also removed the expedition info from brigand and gasbender guides.

* Update Lantern.xml

* Guidebook rewrite

* Guidebook revisions

* Restructured hiring guidebook page

---------

Co-authored-by: Whatstone <[email protected]>
Co-authored-by: Whatstone <[email protected]>
* Check outer clothing for footstep noise

* SharedMoverController Reorder outer clothes comparison
* Ports coffee arabica plant from SS13. TG sprites used. Includes seeds, plant, coffee grounds chemicals, new reaction to brew coffee.

* Coffee PR suggestions

* dark coffee beans: inherit from light coffee beans

* Coffee grounds recognizable, author in meta.json

* Coffee bean/fruit sprites by Stagnation

* Fix coffee.rsi license, attribute produce to stag

* hyphenate

* cleanup: ingredients.yml (heatCapacity, comments)

* Updated produce-beans from Stagnation

---------

Co-authored-by: Whatstone <[email protected]>
@Vonsant Vonsant merged commit 0d3afdc into master Jun 25, 2024
13 checks passed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.